FreeBSD: cfmakesane, EVFILT_* #825

valpackett · 2018-01-03T23:58:57Z

Susurrus

Also needs a CHANGELOG entry.

Susurrus · 2018-01-04T00:01:13Z

src/sys/event.rs

@@ -39,6 +39,8 @@ libc_enum! {
    #[cfg_attr(not(target_os = "netbsd"), repr(i16))]
    pub enum EventFilter {
        EVFILT_AIO,
+        #[cfg(target_os = "freebsd")]


Each one of these need doccomments describing them.

asomers · 2018-01-04T00:21:46Z

Thanks for your submission! Have you checked the other BSDs to see how many define these symbols too? I see that cfmakesane is in Dragonfly, but I haven't checked any of the others.

valpackett · 2018-01-04T00:24:10Z

@asomers the libc crate only exposes it on FreeBSD… ~~I'll add it there for DragonFly.~~

@Susurrus added.

valpackett · 2018-01-04T00:36:21Z

cfmakesane was added to DragonFly last December, not in any release yet. It was in FreeBSD for seven years.

asomers · 2018-01-04T00:37:46Z

Ok. What about EVFILT_EMPTY ?

valpackett · 2018-01-04T00:41:12Z

I have documented _EMPTY. There's nothing in the manpage for _SENDFILE.

(hmm, none of the other values have been documented here before…)

Susurrus · 2018-01-04T01:15:29Z

@myfreeweb Yes, there has been a severe lack of documentation within nix in the past, so we're trying to fix that as we go. It'd be much appreciated if you could add doccomments for the other constants that are there since you're already digging through these docs.

valpackett · 2018-01-04T15:44:15Z

Yeah I'll write some docs there soon.

+ one more addition: fix for write_int ioctls. On FBSD & DFly they're defined with an IOWINT macro that actually uses the VOID type instead of IN, so wrong numbers were generated.

Susurrus · 2018-01-04T16:46:05Z

I'm currently rewriting the macro logic because of the conversation in #824 and #781, so let's skip the ioctl stuff for this PR. I should have my rewrite done by this weekend and I'll CC you on the PR to review that it corrects things for the BSDs as well.

Susurrus · 2018-01-28T18:34:57Z

src/sys/event.rs

@@ -51,7 +54,15 @@ libc_enum! {
        #[cfg(any(target_os = "ios", target_os = "macos"))]
        EVFILT_MACHPORT,
        EVFILT_PROC,
+        /// Returns events associated with the process referenced by a given
+        /// process descriptor, created by pdfork(2). The events to monitor are:


Backticks needed around pdfork() (leave out the "2").

Susurrus · 2018-01-28T18:36:39Z

src/sys/event.rs

        EVFILT_READ,
+        #[cfg(target_os = "freebsd")]
+        EVFILT_SENDFILE,


@asomers Could you help us dig up some docs for this constant?

How about "indicates the completion of an asynchronous sendfile(2) call". I'm afraid be more specific than that.

Susurrus · 2018-01-28T18:38:33Z

src/sys/ioctl/mod.rs

@@ -325,7 +325,7 @@ macro_rules! ioctl {
        pub unsafe fn $name(fd: $crate::libc::c_int,
                            data: $crate::libc::c_int)
                            -> $crate::Result<$crate::libc::c_int> {
-            convert_ioctl_res!($crate::libc::ioctl(fd, iow!($ioty, $nr, ::std::mem::size_of::<$crate::libc::c_int>()) as $crate::sys::ioctl::ioctl_num_type, data))
+            convert_ioctl_res!($crate::libc::ioctl(fd, iowint!($ioty, $nr, ::std::mem::size_of::<$crate::libc::c_int>()) as $crate::sys::ioctl::ioctl_num_type, data))


Let's remove the ioctl changes from this PR, please comment in #833 with a brief description and some test cases that fail on FreeBSD (see test/sys/test_ioctl.rs for existing test cases and please confirm which ones fail). @asomers could you help out here as well?

Susurrus · 2018-01-28T18:39:46Z

src/sys/termios.rs

+///
+/// Note that this is a non-standard function, available on FreeBSD.
+#[cfg(target_os = "freebsd")]
+pub fn cfmakesane(termios: &mut Termios) {


This needs a link to the man pages.

valpackett · 2018-01-28T20:14:51Z

Removed the ioctl fix here, updated comments.

rust-lang/libc#887 has landed, but not in a release yet.

Susurrus · 2018-01-29T03:19:18Z

Please move the CHANGELOG entries into the UNRELEASED section, as they weren't a part of the 0.10.0 release. Then it's LGTM.

valpackett · 2018-01-29T10:40:32Z

done

Susurrus · 2018-02-12T00:58:02Z

Looks like it'll need another rebase to deal with changes to the CHANGELOG file. When you do please post back here, as I don't get an email on changes to PRs that aren't comments.

valpackett · 2018-02-12T10:19:31Z

rebased

Susurrus · 2018-02-21T03:31:24Z

Thanks for your contribution!

bors r+

825: FreeBSD: cfmakesane, EVFILT_* r=Susurrus a=myfreeweb Depends on: rust-lang/libc#887

bors · 2018-02-21T03:58:05Z

Build succeeded

Susurrus suggested changes Jan 4, 2018

View reviewed changes

valpackett force-pushed the freebsd-missing-stuff branch from 6c4e055 to d550555 Compare January 4, 2018 00:21

valpackett force-pushed the freebsd-missing-stuff branch 2 times, most recently from 7ea2152 to d550555 Compare January 4, 2018 00:33

Susurrus suggested changes Jan 28, 2018

View reviewed changes

valpackett mentioned this pull request Jan 28, 2018

Refactor the ioctl API and documentation #833

Merged

valpackett force-pushed the freebsd-missing-stuff branch 2 times, most recently from 4a042fe to 589cc50 Compare January 28, 2018 20:07

valpackett force-pushed the freebsd-missing-stuff branch from 589cc50 to 463511b Compare January 29, 2018 10:40

valpackett added 3 commits February 12, 2018 12:52

Add missing kqueue event filters on FreeBSD

5600cc4

Add cfmakesane() on FreeBSD

d1f49bf

Expose MSG_CMSG_CLOEXEC on *BSD

647bac7

valpackett force-pushed the freebsd-missing-stuff branch from 463511b to 647bac7 Compare February 12, 2018 09:53

bors bot added a commit that referenced this pull request Feb 21, 2018

Merge #825

2b9c67c

825: FreeBSD: cfmakesane, EVFILT_* r=Susurrus a=myfreeweb Depends on: rust-lang/libc#887

bors bot merged commit 647bac7 into nix-rust:master Feb 21, 2018

petehayes102 mentioned this pull request Jun 17, 2023

Add support for BSD mitsuhiko/tokio-unix-ipc#19

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FreeBSD: cfmakesane, EVFILT_* #825

FreeBSD: cfmakesane, EVFILT_* #825

valpackett commented Jan 3, 2018

Susurrus left a comment

Susurrus Jan 4, 2018

asomers commented Jan 4, 2018

valpackett commented Jan 4, 2018 •

edited

Loading

valpackett commented Jan 4, 2018

asomers commented Jan 4, 2018

valpackett commented Jan 4, 2018

Susurrus commented Jan 4, 2018

valpackett commented Jan 4, 2018

Susurrus commented Jan 4, 2018

Susurrus Jan 28, 2018

Susurrus Jan 28, 2018

asomers Jan 28, 2018

Susurrus Jan 28, 2018

Susurrus Jan 28, 2018

valpackett commented Jan 28, 2018

Susurrus commented Jan 29, 2018

valpackett commented Jan 29, 2018

Susurrus commented Feb 12, 2018

valpackett commented Feb 12, 2018

Susurrus commented Feb 21, 2018

bors bot commented Feb 21, 2018

FreeBSD: cfmakesane, EVFILT_* #825

FreeBSD: cfmakesane, EVFILT_* #825

Conversation

valpackett commented Jan 3, 2018

Susurrus left a comment

Choose a reason for hiding this comment

Susurrus Jan 4, 2018

Choose a reason for hiding this comment

asomers commented Jan 4, 2018

valpackett commented Jan 4, 2018 • edited Loading

valpackett commented Jan 4, 2018

asomers commented Jan 4, 2018

valpackett commented Jan 4, 2018

Susurrus commented Jan 4, 2018

valpackett commented Jan 4, 2018

Susurrus commented Jan 4, 2018

Susurrus Jan 28, 2018

Choose a reason for hiding this comment

Susurrus Jan 28, 2018

Choose a reason for hiding this comment

asomers Jan 28, 2018

Choose a reason for hiding this comment

Susurrus Jan 28, 2018

Choose a reason for hiding this comment

Susurrus Jan 28, 2018

Choose a reason for hiding this comment

valpackett commented Jan 28, 2018

Susurrus commented Jan 29, 2018

valpackett commented Jan 29, 2018

Susurrus commented Feb 12, 2018

valpackett commented Feb 12, 2018

Susurrus commented Feb 21, 2018

bors bot commented Feb 21, 2018

Build succeeded

valpackett commented Jan 4, 2018 •

edited

Loading